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

Bug: 166295507
Merged-In: Ia2bf7669ab40996c26e2b0db5fec9387efa1a91b
Change-Id: Idbf8064b452046180970762ee90d6539336fd54a