Merge changes from topic "am-04754628637348948b04fab6958e617d" into...

Merge changes from topic "am-04754628637348948b04fab6958e617d" into tm-qpr-dev-plus-aosp am: 73c7e602

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



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