Merge "Snap for 13284084 from f99d5db98adb5a2415becacd11a7e33d8b2608f7 to android15-tests-release" into android15-tests-release