Merge changes from topic "am-038a028ec25548ecafb51d7e14eb8cbf" into...

Merge changes from topic "am-038a028ec25548ecafb51d7e14eb8cbf" into tm-qpr-dev-plus-aosp am: a1a04992 -s ours

am skip reason: Merged-In I0ea498d2fa191f9b9352b37500a5d2c348b36ce0 with SHA-1 b51ae978 is already in history

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



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