Merge changes from topic "am-19c8f316ee894aa0a901506f702ec1fb" into...

Merge changes from topic "am-19c8f316ee894aa0a901506f702ec1fb" into tm-qpr-dev-plus-aosp am: 0029cf5f

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



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