Android 14.0.0 Release 31 (AP1A.240405.002.A1)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/25909955'] into 24Q1-release.

Change-Id: I99f85c0319c2d891ad06458277b6ecce939282c0