Snap for 7368904 from dbaa14b9 to android12-5.10-keystone-qcom-release Change-Id: I51599893650ad1e3c1b8d70d6282ebc846655a14