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

Bug: 166295507
Merged-In: I5005b312a0c93ff5838c8c4f8ba3e314f34c5b50
Change-Id: Id8036793f031c5093e701ca07fd645c355cd148d