[automerger skipped] RESTRICT AUTOMERGE am: 3f4d3b4ac2
-s ours am: 5045f120af
am: 7bdd4b3273
-s ours am: 5f16b03f50
-s ours am: c54d68ea09
am: d3abc029bc
-s ours am: 57f93997d7
am: b5a0b4f7a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/10420450 Change-Id: Ia2e52949a7ecb3a2936ebcfccd698a9c4a1e7e89
This commit is contained in: