Merge "Only honor preferUiBrandingComponentName with permission" into udc-dev am: b6699962 am: 089eb304 am: 02da1674

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



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