Merge changes from topic "am-7c932fc208fa4104bc73a89be5614517" into udc-dev am: 167fa8f0 -s ours

am skip reason: Merged-In Id91c2b3b6d16ba3702ee2cd6723365a4db52863b with SHA-1 d43f82be is already in history

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



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