Snap for 8068158 from f0bb0b84fd17bcfd79dc17db2f033553a23044c1 to android12-tests-release

Change-Id: Ie25fe22534201638a8acb2c10470d061f913ab6a