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

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

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