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

Change-Id: If8bf73e8c626e391471de83959dce1d2f6fc82b5
tree: 610e1b1a935d1573bc418577546713ee1fa87b24
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS
  6. PREUPLOAD.cfg