Android Platform 15.0.0 Release 12 (APM1.240918.038)
[coastguard skipped] Merge sparse cherrypicks from sparse-12192237-L48700030005686605 into 24Q3-release.

COASTGUARD_SKIP: Ibec4f0c908089ca4304e59e9d37529fa2d4fa40d
COASTGUARD_SKIP: I88c3fb94518d5f1c5ac51b1cc12f14ddada0dac0

Change-Id: Ie625895170513d5737b557afce67eb66af62d711