Merge "Snap for 7424499 from edee420c90d296996aa1f1fd2063fd1091297823 to android11-tests-release" into android11-tests-release