Merge changes from topic "am-22097985f3b54fc3b130440b4d974f8b" into...

Merge changes from topic "am-22097985f3b54fc3b130440b4d974f8b" into tm-qpr-dev-plus-aosp am: ceb18e21

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



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