[automerger skipped] Merge Android 12L am: f8da3416f3 -s ours

am skip reason: Merged-In I311810b8a547a9cf4f6616419553dcc317c9a39d with SHA-1 35c8babcd3 is already in history

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

Change-Id: I7f61cabf8a58432e9a21db6c3b33235cab40dd36