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

Bug: 172690556
Merged-In: Icca07a3dbf948c4d35809c952458d48bd075951e
Change-Id: Ia239a6ba82bf17b2a80bdc734646123a9afb85bb
tree: 0cda4b5a2de6d23d7064eab87e662054c9226839
  1. src/
  2. Android.bp
  3. AndroidManifest.xml