Merge changes from topic "am-8d2be1df9a9c4230816b7bdea829e514" into...

Merge changes from topic "am-8d2be1df9a9c4230816b7bdea829e514" into udc-dev-plus-aosp am: e2c51c11 am: 5d7a29a3

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



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