[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 5e81b7c7e0 -s ours

am skip reason: Change-Id I0de39953451190eb4e7b0f4141b8a4a2fffc3292 with SHA-1 938ce03580 is in history

Change-Id: Ib0c3d77326f4cf350f88ee3d95ff4c90755e6e10
tree: 55786573d3cfb58fae53085826d4477522c933b4
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. build.gradle
  6. OWNERS