Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891

Bug: 214455710
Merged-In: I5b488fa5e435e94b7a62b81bdc543d8126520e5d
Change-Id: I1383dcd0d2bcf23c3b228e0cb009f3684f50db14