Merge "Snap for 7003318 from 48ca333cb60bc1e0fc75ccf4f3488763010ffbe7 to android11-tests-release" into android11-tests-release