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

Merge changes from topic "am-c46e753e59a04ec0be6cb1735ffa925e" into udc-qpr-dev-plus-aosp am: 8d18c44b

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



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