[automerger skipped] Merge TQ2A.230305.008 am: b21232caca -s ours am: 83a17d0a9f -s ours

am skip reason: Merged-In I4c66cd23c7b5f0022b993578b93b648b679585ab with SHA-1 fe0ecef78a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay-kernel/+/21427513

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