Merge sc-dev-plus-aosp-without-vendor@7634622

Merged-In: I2a4f5caa041f6b0e6f950e536ab74be71a5a2a53
Change-Id: I34ac5913bff3b6a14b373a9596065bc953626567
tree: 5f18b1de597aa72651d1a5109bb9156861878406
  1. service-t/
  2. tests/