Merge changes from topic "tc_change_23041807_28" into udc-dev am: ddff8a4b

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



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