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

Bug: 226662282
Merged-In: Ieb699e09ddece5d19317104dccdd6f2af4d8207b
Change-Id: I389b5a1922819ed08f39f473689b5923ce687361