Snap for 7334979 from 186e549e to android12-5.10-keystone-qcom-release Change-Id: Ifedb38bfd40203e189c24af5e49354be3a1a7e7c