Android Platform 14.0.0 Release 23 (UPM1.231025.065)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/30239052', 'googleplex-android-review.googlesource.com/31395458'] into udc-platform-release.

Change-Id: I4bade4a8e9915b24b59669a5acaa7779bb71b153