Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)

Bug: 166295507
Merged-In: Ibe9b0af76fd841db7e64bf8800264df149278cbf
Change-Id: I941272023ad401c3b4d5e4bfa17a0e6080331cf7