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

am skip reason: subject contains skip directive

Change-Id: I2ab9d5a5a29827fd6f4b6629ac5108e7ce6a006d
tree: 1d8088cb9b977e9f8f429be1ccfa35aca192c263
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS