Android 14.0.0 Release 31 (AP1A.240405.002.A1)
Merge sc-mainline-prod

Bug: 189946434
Change-Id: Iae315840f4dac902784fd14ee085f59dd0c7666b