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

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

Change-Id: Ie6a3997d2b2595e408fc32cee45f419db793b616