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

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

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