Merge changes from topic "am-1f6b5056a27a4b83b4ea47a0e8055cce" into...

Merge changes from topic "am-1f6b5056a27a4b83b4ea47a0e8055cce" into udc-dev-plus-aosp am: 6f807ebf

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



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