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

am skip reason: Change-Id I3c937042e78e6a632e5c7f028ce5ffff4152ba44 with SHA-1 c41b27a0a7 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/tools/sysprop/+/12469361

Change-Id: I9e6eaa8936579847377b614e5bb5d7ca8c6eadf7