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

Change-Id: I4b4a2b51adb3c5c2bec684bacfdebab0cd59239a
tree: 6b3fe9c4233d07aebb04f622d9b5b6341386bb1f
  1. proto/
  2. res/
  3. src/
  4. Android.bp
  5. AndroidManifest.xml
  6. OWNERS