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

Bug: 166295507
Merged-In: If762d7cec6f01208e1180d76cdd8ad1ceb2c4d65
Change-Id: Ibacc42681d1dbef7900940791b8620b7e4a5357a