Merge changes from topic "am-6d634d3dab05460c925d9f0d03b665c1" into...

Merge changes from topic "am-6d634d3dab05460c925d9f0d03b665c1" into tm-qpr-dev-plus-aosp am: 1f400bc4

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



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