Android 14.0.0 Release 32 (AP1A.240405.002.A2)
Merge cherrypicks of ['android-review.googlesource.com/2929791', 'android-review.googlesource.com/2929790'] into 24Q1-release.

Change-Id: I90b726358d80f569dde7b69fc7827cf9bf2a1812