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

Change-Id: I1ecb30b7d6ea49d9fcc530831136ed0261933621