Snap for 7458019 from 5691d21fe2fdf94d12fbc28f1f724d375f529b7d to android10-tests-release

Change-Id: Iddbb50be8ec39d5a0592795172a7d03b9f40d5cd