Snap for 7199821 from cc187617 to android12-5.10-keystone-qcom-release Change-Id: I1932c7137e56191fa8c68aac972202ef0d4e5744