Merge changes from topic "am-8f638df199f049eaa67710c826969673" into...

Merge changes from topic "am-8f638df199f049eaa67710c826969673" into tm-d1-dev-plus-aosp am: f47a8322 -s ours

am skip reason: Merged-In Iee1b1caca4d6eb2729feb872c3e4954b6c16519c with SHA-1 b161a3b8 is already in history

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



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