Snap for 6156961 from a13af898bd38e61fc991ae8b18d8db085cd7b7ae to android10-tests-release

Change-Id: I57d7a903cc1ef01183d9ca066b0e21959a87f1bc