Merge "Snap for 7035644 from d982ebf9a3155ddef582364bcc6ecb9135f58c58 to android11-tests-release" into android11-tests-release