DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: 3b49ef3445

Change-Id: I180670ed08710f325b9f83edfe152f10455d856c
tree: 6aa5dcb83e94cc1f32ec5a3b0500b264d0109059
  1. core/
  2. packages/
  3. services/
  4. wifi/