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

am skip reason: Merged-In I232c663631a87da2488bfb354c2e5dbf861fce90 with SHA-1 83ef3ca33d is already in history

Original change: https://android-review.googlesource.com/c/device/google/trout/+/1847355

Change-Id: I2e39f095413fb44df15b1e602f107587550147cc