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

Bug: 226662282
Merged-In: Ifc2e14a9b60e364323794eaa5a8c181c4f0a78ee
Change-Id: Id87ce6ee433f6fc31d18ccdee5a2eb2bc62633e5