[automerger skipped] Merge "DO NOT MERGE - Merge ab/7272582" into...

[automerger skipped] Merge "DO NOT MERGE - Merge ab/7272582" into stage-aosp-master am: d9e78dc8 -s ours

am skip reason: Merged-In I1cc3796f31e7db3d8f062436ebc618d93db19822 with SHA-1 38d3b0fa is already in history

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

Change-Id: Ida0de335047c2cebe9f86810c9fdd529738fdc41