Android Platform 15.0.0 Release 12 (APM1.240918.038)
Merge cherrypicks of ['android-review.googlesource.com/3168701'] into 24Q3-release.

Change-Id: I1ecb30b7d6ea49d9fcc530831136ed0261933621