Android security 15.0.0 release 12
Merge cherrypicks of ['googleplex-android-review.googlesource.com/30046290'] into security-aosp-24Q3-release.

Change-Id: I2d1b64d0813079b23fe5b68a8b903b965bab4bd8