Android 15.0.0 release 24
Merge cherrypicks of ['googleplex-android-review.googlesource.com/30408880'] into 25D4-release. Change-Id: I9e82ac6f97cd9b0ab145efa2b1de548d21b3fca4