[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: 5fa242958e am: 9ff59edd68 -s ours
am skip reason: subject contains skip directive

Change-Id: I1e316bf1ced28b8b71ab05ab0896f49d549ab269
tree: 940fb7d996cdcc22d20648491bcdb63e9ee00763
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg