Android platform 14.0.0 release 3
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24879207', 'googleplex-android-review.googlesource.com/25096450'] into udc-platform-release.

Change-Id: I0d4ed3337b5f069464fba0ae3b5445b060064f35