Merge changes from topic "am-67940f1d9e3d4b94b33b6942a61a0c02" into...

Merge changes from topic "am-67940f1d9e3d4b94b33b6942a61a0c02" into tm-d1-dev-plus-aosp am: 808da234

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



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