Merge "Fix nanosleep in BootAnimation" am: 45e281ef2b am: 73357c61d0 am: fd42131e14 am: c42a8a0793

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1891586

Change-Id: Iebc79f0ba23152c05de1f456fec984e225c1ea03