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

Bug: 166295507
Merged-In: I0bbfa9c7755bc44a125a01aafe7d6ad7bb64fa1b
Change-Id: Icdb90bf3af72f16e59dee05fea2b4911750a8243