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

Change-Id: I22c7ba6e1ed690327e638ec277bdd3c0926f8903