Merge changes from topic "am-4d4933939782434894ecfea9a8939979" into...

Merge changes from topic "am-4d4933939782434894ecfea9a8939979" into tm-d1-dev-plus-aosp am: 9ffd7ecd -s ours

am skip reason: Merged-In Ib507352107c0d825b8c7a9605713bc9083259fbd with SHA-1 0167a4d8 is already in history

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



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