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: Ia342197c302d0226ed60ec9c8f9baa57d6b82fce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>