Android 15 Beta 2 GPL (AP31.240426.022)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/27120132'] into 24Q3-beta-release.

Change-Id: I1b26afedaa923ddfb7014e1e43666b65205ae74f