Android platform 15.0.0 release 9
Merge cherrypicks of ['googleplex-android-review.googlesource.com/28840866', 'googleplex-android-review.googlesource.com/28950472'] into sparse-12231025-L28400030006052204.
SPARSE_CHANGE: I6cd0671820ae9a68a40be2b06bd4e4897fa69b19
SPARSE_CHANGE: I331a2d901cfa27c8a0e7fc2729dfaf7075c30e67

Change-Id: Idcb37ea57da155df8254676e5feec60143fe5fdb