[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 62a7548a53 -s ours am: a8276eb0a3 -s ours am: 8dc1622332 -s ours

am skip reason: Change-Id Id4209f2f8680b0eb60e3aaa8eb26b6c18bf59125 with SHA-1 f2a3678c34 is in history

Original change: https://googleplex-android-review.googlesource.com/c/device/common/+/12469980

Change-Id: Ibce761df83ff3045cf6f4bc774cbf71388b0a73e