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

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