Snap for 7228374 from 4aa47f58 to android12-5.10-keystone-qcom-release Change-Id: I8723b40f144fe64b74572bdc9cbf667da8c4e42b