Merge changes from topic "am-71c27608aed14952b04fbb21f0150fbc" into...

Merge changes from topic "am-71c27608aed14952b04fbb21f0150fbc" into udc-dev-plus-aosp am: 1251421e am: 1fec325e am: 1d54095b

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



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