[automerger skipped] Merge Android 14 am: 53400ce7d2 -s ours am: dfe5a95db9 -s ours

am skip reason: Merged-In I50f6f6a22736f8b367bd140cd3e5e0e68dbe6cea with SHA-1 df393309db is already in history

Original change: https://android-review.googlesource.com/c/platform/system/libufdt/+/2777058

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