[automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: d57e13f558
-s ours am: d92daf10ef
-s ours am: 744507f78b
-s ours am: e32ed22547
-s ours
am skip reason: Change-Id Ie9d2c4d6d4618a167af1c5627d5d7918a404f398 with SHA-1 733eed05c8
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12484180
Change-Id: Ia5f0f1a1143e1533eb997d4cf1ba771e11b207a1
This commit is contained in: