[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 70df5b2e29 -s ours

am skip reason: subject contains skip directive

Change-Id: I7bbec4ecf7a0e38fa3912287e2c172ca9e925e8c
tree: 8a7b4b3cb9ef3edb5806fb7b4862a640d2c5451f
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS