[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 9963fbe1af -s ours am: 489d395987 -s ours

am skip reason: Change-Id I34ccc9cc6314aeb5babb95302be1801fc9bacd99 with SHA-1 b95e2339e3 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/developers/build/+/12469978

Change-Id: I9464ba4b79260ad9a612bb9029d380d4304435c3