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

Bug: 166295507
Merged-In: Id8ad6ce0b8f22cff73bff3c34f092021d99158bd
Change-Id: I908ebc0537b77bd31f31e259d3edf20647a5e7bb