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

Bug: 166295507
Merged-In: I936f79eeb10a855313078492294a975414dc4b9c
Change-Id: I349663519ef1c6b0644245e35850b19eb6ce3bab