Android security 15.0.0 release 12
Merge cherrypicks of ['googleplex-android-review.googlesource.com/28645058'] into sparse-12210230-L62100030005810919. SPARSE_CHANGE: Ie4c8a87b2b3fa7fa50047ef143a8cdd84186e5cc Change-Id: Ic0ca11b601d07ecdffb67928edd64b980934696d