[automerger skipped] Merge "Merge "Resize boot animation on display changes" into rvc-dev am: 569b3fbfa7 am: 6066c45d80" into rvc-d1-dev-plus-aosp am: 0cdbae7280 -s ours am: e76adb8203 -s ours
am skip reason: Change-Id Ib3f0383686399669e8de10456092baaec607fa01 with SHA-1 1a6e368920 is in history
Change-Id: I1c8fe055de9f656da60d0520957b6704ea7186bf
This commit is contained in: