Merge changes from topic "am-2194a6a85b914b21804de4e27b3bc48e" into tm-qpr-dev-plus-aosp am: 0ef373f9

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



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