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

am skip reason: subject contains skip directive

Change-Id: I350f6d33fd304e0ea62a43f62338cfc759627649
tree: a8de35d14e792f558f8f69e7e8ea905ad2cda6df
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml