Merge "Snap for 6904889 from 07a02a30471ed9a9bd21ae69d4fc911e1bd6e457 to android11-tests-release" into android11-tests-release