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

Change-Id: I4fc744414bcb09b9b7502441d81ee9064b1b728d
tree: c42a90aacfe1c07af564ada7ea03e559767ab543
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS
  6. proguard.flags