DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: 2672468e70

Change-Id: I07899ba0b02407a387d2530f2cf50c659f5c1cbd
tree: 8624580e54802aabb1dcc6e65792ed247c7c598f
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS