Merge changes from topic "am-4e7ca78306974e4f93f211c1f71f6c9f" into...

Merge changes from topic "am-4e7ca78306974e4f93f211c1f71f6c9f" into udc-dev-plus-aosp am: b01c8605

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



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