Merge changes from topic "am-52f1e073427d431498ea82df3bd4b4e1" into...

Merge changes from topic "am-52f1e073427d431498ea82df3bd4b4e1" into tm-qpr-dev-plus-aosp am: 08041f37

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



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