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

Bug: 146167222
Change-Id: Ifeb003ec9b3bf824f04d31a117aea65d517241fb
tree: 180ef9403c180e214c717862488f6d1c0b2eb2ae
  1. core/
  2. services/
  3. tests/