Android 14.0.0 Release 25 (UQ1A.240205.004)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/25443834', 'googleplex-android-review.googlesource.com/25189037'] into udc-qpr1-release.

Change-Id: Ic40f4d7b0d2575feaa9c10a80be2b7a20e938213