Android 15.0.0 Release 2 (AP3A.241005.015)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/28599854'] into 24Q3-release.

Change-Id: I87787ef2c28ae2424aaf68b329cdea2946497a87