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

Bug: 214455710
Merged-In: Ie851c6a2d4f1f890f62dd6db52e692ef1e615da2
Change-Id: Ic6bcb2050032dd3c5e611fcd6cfbbd97d8e59a01
tree: 7b822b94e096320489516efffaa441546e5c1e36
  1. apex/
  2. framework/
  3. service/
  4. tests/
  5. OWNERS
  6. PREUPLOAD.cfg