DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master

Bug: 142003500
Change-Id: I10598042b88b6509ed29dee05fe27ca9decf184e
tree: af0c65ac4b6eaa7798238c15ec56eaceacb97685
  1. service-t/
  2. tests/