Merge changes from topic "am-119eb3c6021b40a4899c09f8bfb8bf1c" into...

Merge changes from topic "am-119eb3c6021b40a4899c09f8bfb8bf1c" into udc-d1-dev-plus-aosp am: 7ca1b2fe

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



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