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

Bug: 226662282
Merged-In: I4cb84aa9b69ff872f5de7a5e9c5ca1e3405d2d8b
Change-Id: I19597ca760cb176e9e95e61722962e770e01ec0d