Snap for 6021536 from b9634e86181d51445a0d7be3e41450d91bae21c2 to android10-tests-release

Change-Id: Id8d739e2c80d6d77a3ba263bf76d0c96f2180d25