Snap for 7372064 from 0a6e35fd to android12-5.10-keystone-qcom-release Change-Id: I9ff8c963c2c44746f8cd0a0e5e3731bf069eb3f2