Snap for 7068654 from 6ea1b6912ae4116ab28baa223a6521cd5fbb0158 to android10-tests-release

Change-Id: I13582c18a2b375b9cc869a5b473cbd538fd28475