[automerger skipped] Merge Android 12 am: 8d637d305c -s ours am: 682f7012bd -s ours

am skip reason: Merged-In I793b678232ad2a620eb137cb1640b89ff351f455 with SHA-1 7e63670840 is already in history

Original change: https://android-review.googlesource.com/c/device/linaro/dragonboard/+/1847375

Change-Id: Idc4c6e36733981d7c07046b428e48aa2731c780d