Merge changes from topic "tc_change_23042206_47" into udc-dev am: ef196f7f

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



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