DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
am: bae8a2d404

Change-Id: I0011e677c514464a8e4a7af830c4343170dc2cb6
tree: 122e04a1c30438374f5e6607d70173c85b2ef64d
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. OWNERS