Snap for 6659318 from 1b2ea77a4123476bf35f58c3c8dc0eeebc93e488 to android10-tests-release

Change-Id: I581fa7a583a15c255cffc72c3828f58ac7570cc6