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

Bug: 214455710
Merged-In: I7d874efca71af66a7906e66c5d90b183714af8b2
Change-Id: I12a791ed2c624aeaa840968244d724a45ccc93c2