[automerger skipped] Merge "Fix boot animation when device is folded" into...

[automerger skipped] Merge "Fix boot animation when device is folded" into tm-qpr-dev am: aa1a59e6 am: 8c5080bc -s ours

am skip reason: Merged-In I5a7c7c3fe6d07d22733d98c2ff2dbe6a9392f05c with SHA-1 2766b1c8 is already in history

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



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