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

Change-Id: Ibb510ec02656e59b851599f88ae31c6e10377fca
tree: 560c5875cfb7c57fc417dd85fd15f699aacfce2d
  1. core/
  2. services/
  3. wifi/