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

Merge changes from topic "am-6a89556b0f144a87abc7fcd05a7de322" into tm-qpr-dev-plus-aosp am: 17eab9ae

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



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