Merge "Adjust branding image layout if needed." into tm-dev am: 9a14b7c2

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



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