Merge changes from topic "16k_dev_ui" into main am: 2452ea37f0

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

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