Merge "Make change and version bump to RT13.240407.001 Snap for 11680132 from 16caffd2e7ad0af4417b13923592874a16b7d0f3 to android12L-tests-release" into android12L-tests-release