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

Bug: 166295507
Merged-In: Iaecb67ed1eeb890b29ac4e6f2808a6f9dff001c8
Change-Id: Ie7a92abe3ba5e8ed52e268bc8ee6e2464663a975
tree: ea4eeed4c0683dc7fa4aea8d169a104a84c3ae0a
  1. Android.bp
  2. src/