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

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

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



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