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

Merge changes from topic "am-c8328431a47c4eebb006716640e11064" into tm-qpr-dev-plus-aosp am: c570258c

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



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