Android platform 14.0.0 release 7
Merge cherrypicks of ['googleplex-android-review.googlesource.com/25135945'] into udc-platform-release.

Change-Id: I294daaa2cb77ff159fb7946063c812f3ae963763