[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 1828f386b3 -s ours

am skip reason: Change-Id I6287bcf3941b664e1a2f35a066f20b14f4a6fb92 with SHA-1 4f675ad271 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/tremolo/+/12470186

Change-Id: I10e2b5972b85a7ec536e63ff07585e4bf179656b