Merge "Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged" into stage-aosp-master