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

Bug: 226662282
Merged-In: Icbf3e66e61e7ebb570ac3aba5f1cf9e10ef6720d
Change-Id: I3923ef27f76275ec463fda1de42a0ef3675b4075