[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-03a3a875d0c94ff6acffde163153233a" into sc-dev am: 7e7af0ff -s ours

am skip reason: Change-Id Ib794c5f2d904c2b187d7d5fd00b81afc852d0052 with SHA-1 93af3137 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3cc7c03db1b0d727ff2d8a48b1f5eaebda880b52