[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: 3b49ef3445 am: 2ccb93a98c -s ours
am skip reason: subject contains skip directive

Change-Id: I8cd5a78633d18b734a7232794ce24f49b0a964df
tree: 213061c8a98a8199357f46a1599064b65b0037a3
  1. core/
  2. packages/
  3. services/
  4. wifi/