Snap for 7261498 from 2a16c1ac to android12-5.10-keystone-qcom-release Change-Id: I9bad61c3c53b3ccd7bfdaa3c2b71410058109591