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

Bug: 226662282
Merged-In: Ib64ddfbb5c4cab579b61f0fd98a4fb39381010e0
Change-Id: I62c933d005dedc89a6f1b041c0fc1103189f9ebd