Snap for 7235356 from b4b04c2a to android12-5.10-keystone-qcom-release Change-Id: I873e0b962e28b740de3dada6174676e94bcac0f7