Merge changes from topic "am-ade9939dcc86447b9557decc69f1b2a9" into...

Merge changes from topic "am-ade9939dcc86447b9557decc69f1b2a9" into udc-d1-dev-plus-aosp am: 80cc76ed

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



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