DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: b01d826329

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