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

am skip reason: Change-Id Ia85aa5b8d01660fe1a5cfe5a9e24d19348c7e741 with SHA-1 20ff6e0734 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ms-tpm-20-ref/+/12469628

Change-Id: Id302295260f59c4eaf86e474ec4cb918c3961cc7