[automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged am: d2d6a86be4 -s ours

am skip reason: Change-Id Ib529a230cb2c17e8acd8e03ba88f426a57bb8a6c with SHA-1 418b231a04 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/keymaster/+/12469967

Change-Id: I0276f21bb42bc62d08aec03ecbcedac27b3a14db