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

Merge changes from topic "am-c1773d780890403592114bbff254b56b" into tm-qpr-dev-plus-aosp am: 4afa5209

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



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