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

am skip reason: subject contains skip directive

Change-Id: I6f0a1470fccd1a7cda2dc32129152188676b9a05
tree: 0f73d2ac03e0443063647ee8511d20ad24cacb6c
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml