Android VTS 16.0 Release 1 (BP2A.250605.031.A2)
Snap for 12841962 from 71c612c5997130b7b3b303627c1b6052a1a1a19c to 25Q2-release

Change-Id: Ie236be5a817918d5c2215087311fb5f2dbb2cc00