Snap for 6124395 from db5c1bc4ab5b65bcb23ae872c47df65d9defe727 to android10-tests-release

Change-Id: I9fd9fd704506190168905165cd8adeb45cc4c1d1