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

Bug: 166295507
Merged-In: I24ffe2f1ab61630680f782d1b2167e9559ad7c36
Change-Id: Ic9c1b20bc82dafc3ba31517675a4152314279c24