[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5713463) into stage-aosp-master am: 111584b14c -s ours
am: d7dec84e0c

Change-Id: Ib875870cdd045beff56e16ff2357df404ae76270
tree: 44e97b5da0638794c77ff55dda6cd93dca15f045
  1. core/
  2. services/
  3. wifi/