Snap for 8482148 from abed76bf3e0f293760c5f331c41fdb71e5853e98 to android12-tests-release

Change-Id: I910b2bdb5d44309d61da7d83725deee03b0de602