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

Bug: 166295507
Merged-In: Idecc05dd41a819dbfef22c6d6d560e781a33ee49
Change-Id: I5cfd4442bd5219a870913054161588433b785524