Merge changes from topic "16k_dev_ui" into main am: 2452ea37f0 am: 4f69c25fa2 am: 2c13dc74cb

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

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