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

Change-Id: I180670ed08710f325b9f83edfe152f10455d856c
tree: 180ef9403c180e214c717862488f6d1c0b2eb2ae
  1. core/
  2. services/
  3. tests/