[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master am: a0a7ae6c58
am: c8b381202f -s ours
am skip reason: subject contains skip directive

Change-Id: Ib3d5629a17b381c593de7f592922e9c0c873b4eb
tree: 25262c115ee53a0576886637b8acbe386033a1c6
  1. src/
  2. Android.bp
  3. AndroidManifest.xml
  4. OWNERS