[automerger skipped] RESTRICT AUTOMERGE am: 0c870fd7 -s ours am: 74ca730b...

[automerger skipped] RESTRICT AUTOMERGE am: 0c870fd7 -s ours am: 74ca730b -s ours am: 22864c72 am: 24ec36b6 -s ours am: 40961e80 am: cf7f3352 am: edad8243

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idf07ef6acf26be8079fd48d4af4311c7b38f330a