Merge "Snap for 14500063 from f8fcb1aab6c89d0838ea8bb159d797b4115e2da7 to android15-tests-release" into android15-tests-release