Merge stage-aosp-master into pi-dev-plus-aosp

Bug: 126125118
Change-Id: Ifeafc16bc4f434aa86b015b4bbedceee14dc334f
tree: 399d4d1667cb4459fd936a6a1b80d2213e81dcef
  1. service-t/
  2. tests/