Merge "Snap for 13165332 from c2a2e8b0fbe945eb9a8bea49a8d02e53b4bfa89d to android11-tests-release" into android11-tests-release