Merge changes from topic "tc_change_23032218_17" into udc-dev am: 8e1e45468b

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

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