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

Bug: 151763422
Change-Id: I4c8d4241632ae20da0a87f90303990f39d9e8c9c
tree: 6072ba3fe89d7c1189fe9368b8564b8f0fe40302
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS