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

Bug: 151763422
Change-Id: If02051669848f71d9950944c53cf7b54a35ca0cc
tree: ae796d1b0263f7380ac02e6fac4a457f26b93341
  1. Android.bp
  2. AndroidManifest.xml
  3. res/
  4. src/
  5. tests/