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

Bug: 214455710
Merged-In: Ibd57bdd8defb1b60844194ec82c72060a3026710
Change-Id: I725c52384c583c41ab48855bb76bc482ac33c4aa