Merge changes from topic "am-381268eab73b4ba29f9c53484324b315" into...

Merge changes from topic "am-381268eab73b4ba29f9c53484324b315" into udc-qpr-dev-plus-aosp am: fb27416e

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



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