Snap for 7406509 from 361b065e to android12-5.10-keystone-qcom-release Change-Id: I16d3e7c4585de69002d4aed5def0cd3de93dca72