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

Change-Id: I42154fa3960f0b1d97cc58dd963e6f7577f7e509