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

Change-Id: Ib6f128a862b47b895bf859cc5bc3ce90a4197bb7