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

Change-Id: Ice86e75914d73d4043bd077bb4aeccf03f540ca1