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

Change-Id: Ic9158b0c323f48d350a10e83791e4c9ac31fa558