Merge changes from topic "am-69bbabe4aa46467eb85a40ee75080959" into...

Merge changes from topic "am-69bbabe4aa46467eb85a40ee75080959" into udc-d1-dev-plus-aosp am: 8fd358b7

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



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