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

Merge changes from topic "am-ed5d77f7685c443197cbca230cef63e8" into udc-qpr-dev-plus-aosp am: 97246649

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



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