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

Bug: 172690556
Merged-In: I0711c10ffa93994acdf978e62d61227eb3f45974
Change-Id: I4e02ba38f70d8358ae2e70a9920320e4b09f3d61
tree: e1ec51eaa5ee5a02ced7e8abe816580c3136c8f9
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. OWNERS
  7. proguard.flags