Merge changes from topic "am-783809c7ca4b483db6c95715ef64a24f" into...

Merge changes from topic "am-783809c7ca4b483db6c95715ef64a24f" into tm-qpr-dev-plus-aosp am: fdd2f017

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



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