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

Change-Id: Iff2bbcd43fac676c4ae7bc4001b77da186f12a7f