Android 14.0.0 Release 22 (UQ1A.240205.002)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/25008425', 'googleplex-android-review.googlesource.com/24969251'] into udc-qpr1-release.

Change-Id: Ic2873946e9a04d9b0724162980df20cb91ed3e71