[automerger skipped] Merge "Merge Android R...

[automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: 9d078232 -s ours am: 27d11813 -s ours

am skip reason: Change-Id I70ea776b8589ac3a7982c710c5c8b2941d86e55b with SHA-1 9b45d620 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/12484847

Change-Id: I60f3977bf8bb4243381c263633a5a78aca4374ed