Merge changes from topic "am-414a94947bed43e6a84cfcb1fa2914a3" into...

Merge changes from topic "am-414a94947bed43e6a84cfcb1fa2914a3" into tm-qpr-dev-plus-aosp am: 785cbaf8

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



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