[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: b01d826329 am: 4cba1ae85d -s ours
am skip reason: subject contains skip directive

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