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

am skip reason: Merged-In Id6088ae38b04e4587c41eed55b0a93051c4b353e with SHA-1 f6ec19ee96 is already in history

Original change: https://android-review.googlesource.com/c/device/ti/beagle-x15/+/1847346

Change-Id: Idda03dfa36b77db24cc46c484b2316323390f84c