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

am skip reason: Change-Id I7f24ce55495ad35a99dedb38d4d3b53ab7d3e3b2 with SHA-1 f465c37876 is in history

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

Change-Id: Ib877588fbcfca81e7056d167ae14cc3167619e7f