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

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

Change-Id: I2a57d1d79aaef67f8fadd47b0e49a9a88d62cf5d