Snap for 10047152 from 3323c87bfaa12bf5763292ea4c073264056744de to android12-tests-release

Change-Id: I7da5691023e353e96ff9835c3e9a78fb1305ab10