Merge changes from topic "am-6a80ad22a95146729ffb32509025cb72" into...

Merge changes from topic "am-6a80ad22a95146729ffb32509025cb72" into tm-d1-dev-plus-aosp am: 16fa0215 -s ours

am skip reason: Merged-In I7449a24427c966c1aa4280a7b7e7e70b60997cca with SHA-1 98e3bfde is already in history

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



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