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

Bug: 226662282
Merged-In: I1a32556cdff371138118028772b773f5e9b22c61
Change-Id: I704f0af8492ec142fb1b3d62b99f84da01c117cf