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

Bug: 166295507
Merged-In: Ib9a00cd1def83755029fd97eefafd791f38dc5bc
Change-Id: Id41e3ef8bd7d4487a754f33d25ff00e69633adc9