Snap for 7238005 from 3f22a227 to android12-5.10-keystone-qcom-release Change-Id: I9d617f7d45b81393da3b0e038051f8cc9c42afb3