Android 14.0.0 release 39
Merge cherrypicks of ['googleplex-android-review.googlesource.com/25269146', 'googleplex-android-review.googlesource.com/25692509'] into udc-d2-release.

Change-Id: I189eb5ed18a79f717dae26fabf3ed50af470cc4d