[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 43729fbb2c
am: ad64abe7c7 -s ours
am skip reason: subject contains skip directive

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