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

Bug: 172690556
Merged-In: I605ddd3ec49d76263f9aa426162e0fae469b1a4f
Change-Id: I5fbd18c3c0fa0b35fd0d03b0f51e22b6c6ecfcd6
tree: 1c1b12f01301ce6e9d9197859abb3c2320658c9f
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS