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

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



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