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

Bug: 166295507
Merged-In: I8204993b0fc5a9ad2845069f965c86a2c5f23d9f
Change-Id: I21785fc2355fcb5f0dcca84f17c0f360538edea1