DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master

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