Snap for 7867141 from 823f3f3c5bc2ac9a2a63224356d286f2037a343a to android12-tests-release

Change-Id: Ie86406276260dcf07915c6ea8378b19d32911a96