[automerger skipped] DO NOT MERGE - Merge Android 13 am: 36b61ef220 -s ours

am skip reason: Merged-In Ifae54924e2e2b6cf8fc04cb1aa6b20a619af916a with SHA-1 57eedd9c73 is already in history

Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/2186737

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