DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master

Bug: 151763422
Change-Id: Ic473afb4e1ca0e44886627e7e9cb6079427ac926
tree: 847bde34e76017e6a90cf2107c287761e502f7e0
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. OWNERS