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

Bug: 166295507
Merged-In: I3c057a5bcd5939ab71c33b3e50bceccfc40c522b
Change-Id: I8a367b1dd392f1a40c1805bc0589c7dfb6b2d080