Snap for 8020074 from efcca342036b399c4defb094ac030e363a215aee to android11-tests-release

Change-Id: I7b20c489e597ad8a9d7af9385b5e2b4b1a372f89