Merge sc-v2-dev-plus-aosp-without-vendor@8084891

Bug: 214455710
Merged-In: I8cfa435bb6233818adb9cc99dadeeb06a03443d5
Change-Id: Ib93992d88fd1704179009a3872798b9e7b83a6d1
tree: 17a37151fc4662e19c1ed6caa88e013e33eb1deb
  1. framework/
  2. framework-t/
  3. service-t/
  4. services/
  5. tests/