[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 skip reason: Change-Id Ib3f0383686399669e8de10456092baaec607fa01 with SHA-1 1a6e368920 is in history
Change-Id: I36c4c179f9186cdcfcf8fa4377b68167c0dd3dd8
This commit is contained in: