Snap for 7223009 from c9ba6258 to android12-5.10-keystone-qcom-release Change-Id: Idba891c05b8ed71fa66d4376bf17e38d53ca4dd8