[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-9133ba3303c24ccdb98046e4d813c721-sc-dev" into sc-qpr1-dev am: 7b40a559 am: 409ac95f am: f56cc905 -s ours am: 88519ff8 -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: I0d1a7dea54a1b98aec4afba53491786b359fa238