Merge "Merge "Only honor preferUiBrandingComponentName with permission" into...

Merge "Merge "Only honor preferUiBrandingComponentName with permission" into udc-dev am: b6699962 am: 02582322" into udc-d1-dev-plus-aosp am: dc871c66

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



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