[automerger skipped] DO NOT MERGE - Merge Android 13 am: 87032e6a1e -s ours

am skip reason: Merged-In I82092789330f429ad82fb168048d89b9c19e9158 with SHA-1 4714ee4dc0 is already in history

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

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