Snap for 5927222 from e1f53eaa940704459e92defada29cffc9ba153ad to android10-tests-release

Change-Id: If74a2ac4864067d9de35c79535da666a01ee7d8e