Snap for 6564334 from eef3f22ed8973b6e48032f4517974938a01cfb38 to android10-tests-release

Change-Id: I5c6d1f057f32d3f6682c5bfb866e76e6a89deffc