Merge changes from topic "am-6af50db9c56b46a4aac24a2211c95a75" into tm-qpr-dev-plus-aosp am: ec751c2b

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



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