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

Bug: 226662282
Merged-In: I866d3f79fdf1f80e1863d8c3f3cf8b04266e5777
Change-Id: Ia4519149b1791d22dd6a77cfe9b70cfbd3341170