Android 14.0.0 release 21
Merge cherrypicks of ['googleplex-android-review.googlesource.com/25163335'] into udc-qpr1-release.

Change-Id: I10e137f6ba5819ad76af42ab597ce4d31508bc14