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

Bug: 226662282
Merged-In: Iada34671296ebb7c1dc372638c91320bad6e7166
Change-Id: I5d8e30acabaf929e87d3bbca9e67b160ae81a4be