Snap for 7228374 from ca9f06d0 to android12-5.10-keystone-qcom-release Change-Id: Ib7d9b9d10f3800d0e2ff902c911b05625500fc53