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

Bug: 172690556
Merged-In: I0ff1f1cc1932f7446425cc7ad32d4533a3f790e0
Change-Id: Ia62dc7f164f6d89b0cbfb8663c8cd7352388fea6
tree: 9957730630f481c9b3be4ce806b70125ee44b5f0
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. NOTICE
  6. OWNERS