[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 86f69a2687 -s ours am: d87004b90e -s ours am: a33abfb674 -s ours am: 812fa24d74 -s ours

am skip reason: Change-Id If0012214cee84d7e317b338d99778cdfb08b8cf4 with SHA-1 44f2e45de2 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/test/vts-testcase/fuzz/+/12470407

Change-Id: I28d8613c4f3088b9f529bcda6452d6410d047960