Snap for 7244120 from afdca0db to android12-5.10-keystone-qcom-release Change-Id: Ib7985dc6b08d3f596328af1446bbdf60a7bd3ea3