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

Bug: 166295507
Merged-In: Ibc4ae4fb5c48ab4bdcdb3d94994813120f915a58
Change-Id: I680bc09fdf53618bf9f748b92dc5b4631d46f901