[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 646ebffe4b -s ours am: 2f65e12f9f -s ours am: 32171c78bb -s ours am: eb70b0d8ed -s ours am skip reason: Change-Id I9e2ef3615569878064119bc776e069fde6905ecb with SHA-1 5ff209f02f is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/pdk/+/12470313 Change-Id: I17a9c2020b232942464e88a394e1ce5fbb9aa2bf