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

Bug: 166295507
Merged-In: I49c82ad516931b8a7c90dc446a5df5e6ee52e56f
Change-Id: I609894770235673dc005d118062b9f8b4af08ba8