Merge "Merge TQ2A.230405.003" am: 37b78cc90b

Original change: https://android-review.googlesource.com/c/device/google/barbet/+/2530280

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