Merge changes from topic "16k_dev_ui" into main am: 052a1658e4 am: 7b96c4e57b

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2775987

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