[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-9133ba3303c24ccdb98046e4d813c721-sc-dev" into sc-mainline-prod am: 71ded27d -s ours am: c91fc6ad -s ours am: 0576c876 -s ours

am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99d is already in history

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

Change-Id: Ie1b24732c1259c8d3725e5aa2bf2cc90b780ab0b