Merge "Improve the boot animation fix" into tm-qpr-dev am: 4f726c8c

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



Change-Id: Id546e6c356228098111bb31572a36c32ef795f26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>