Merge TQ2A.230405.003 am: 53f33ec955

Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2530521

Change-Id: I37bb814d77d3e7930a5d1b750bfab5cb5436e3f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>