Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) Bug: 166295507 Merged-In: I7ebdd475c17377ecd3b6a7586442b55a12e32c37 Change-Id: I3eacc623ecb0e0c2fb65633d5d6ab9df811c61dd