Merge "Snap for 7066293 from f6e442814abf261be425218323ea2dff075b5a67 to android11-tests-release" into android11-tests-release