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

Change-Id: I41379dbc8be0dd9a9fce304a8ebb651556eb5244