Merge "Snap for 14607894 from a6baa58756dcb020cc7be1fa1e15efe5707ebb6d to android15-tests-release" into android15-tests-release