Snap for 7275859 from 6947c86b to android12-5.10-keystone-qcom-release Change-Id: I0aa0c5de6ff3b3508e39685ce259b64d82be575d