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

Change-Id: Id15c56109243e7a392a40f217ae217a2ddf2ede7