[automerger skipped] Merge "Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged" into stage-aosp-master am: 694c333ead -s ours am: 7291ad36d4 -s ours

am skip reason: Change-Id If41ed345ece16df2ce6a88f501b34a4c1e5b027f with SHA-1 a1be0b7190 is in history

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

Change-Id: Iab6390180864b78c860d6b86af73a90226b00a3c