Android 15.0.0 release 28
Merge cherrypicks of ['googleplex-android-review.googlesource.com/31416177'] into 25Q1-release.

Change-Id: Iad011fb97adc78282af9e30ee07e934db2e06a4f