Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855

Bug: 172690556
Merged-In: I0162e164c47b479307b9ddf67f6d979aedc515cf
Change-Id: I848995fc8b952a2996c2e7c4d929613e034a66b0
tree: 41e1d867f36d2b2dbafa3b282f076bb787695c0c
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. OWNERS
  7. PREUPLOAD.cfg