[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: d2dde212b3 -s ours am: b598870314 am: bd3ab2930d

Change-Id: I456986028ea37fb7e0e07f8516b986dd9a5c297d
tree: 9e3eb0c537ba3dcb438c34e1879aa00130da70fa
  1. Android.bp
  2. OWNERS
  3. build.gradle
  4. java/
  5. tests/