Merge "Snap for 12359238 from 1d64e16b4491833a371a9e1428a8718adc079f57 to android15-tests-release" into android15-tests-release