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

Bug: 166295507
Merged-In: I2d8f6032d2eb1b5cc8450c917c8aa1c9cd72ac0f
Change-Id: Id8b137d2a24f79c5dfcd8a5ebbdd232bcc134caa