Merge "Snap for 6949450 from f190ecb855b083eb3f469c5005da5e93b65d9a69 to android11-tests-release" into android11-tests-release