[automerger skipped] Merge "bootanimation: correct logo position and size...

[automerger skipped] Merge "bootanimation: correct logo position and size after resolution changed" into tm-dev am: c8d87910 -s ours am: f5e1eaa1 -s ours

am skip reason: Merged-In Id09490ecf7fc4b3e1a6baf073c134f357e9b327f with SHA-1 764ea044 is already in history

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



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