Snap for 8068158 from 0cfe20796e31f19fb5ab49bcd6898d24af886d99 to android12-tests-release

Change-Id: Iff2cd875aba17d71151334287550ec894f1beb9d