[automerger skipped] Merge "Resize boot animation on display changes" into rvc-dev am: 569b3fbfa7 am: 57222b5418 am: b188f0c8ed -s ours am: 60779dff05 -s ours
am skip reason: Change-Id Ib3f0383686399669e8de10456092baaec607fa01 with SHA-1 1a6e368920 is in history
Change-Id: I5468d66f72e1485af0a3a51586da68b506e16d49
This commit is contained in: