[automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged am: cdb7a341d4 -s ours am: 570fb1d38e -s ours am: 43c2a7b282 -s ours am: bc8b870cd7 -s ours

am skip reason: Change-Id Ic91ee1134eb9cc96b09970635ad26da3e0246910 with SHA-1 010600680d is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/marisa-trie/+/12469816

Change-Id: I6e6dc73b3e688bb202b6a4270698d24261695afb