Android 15.0.0 release 24
Merge cherrypicks of ['googleplex-android-review.googlesource.com/30551087', 'googleplex-android-review.googlesource.com/30552213'] into 25D4-release.

Change-Id: I00c3478c5d2da1381022caadf7bc2b191dc59e36