Android platform 15.0.0 release 7
Merge cherrypicks of ['googleplex-android-review.googlesource.com/28238298'] into 24Q3-release.

Change-Id: Ie5ed00228eab2e4f70f7bf3682269de34b658342