Snap for 7012180 from caaf9aa333ef7784023e99bd6f893de7d629d8b4 to android11-tests-release

Change-Id: Ifc8fa3ecc8ecb398a8f1ef0dd96c3880d40e22ca