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

Bug: 214455710
Merged-In: Iefda7364da3f5a5a8ebb70758ff126553bd64e16
Change-Id: I433a20010d6eb1ad3aca45d7e4b663510f1b023d