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

am skip reason: subject contains skip directive

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

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