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

Bug: 226662282
Merged-In: Id7a5d5728332e94e96eeb32f6b57875a5e78c47f
Change-Id: I111b838aedff59f51e1920b221ef015d9d818aa4