[automerger skipped] Merge Android 13 QPR2 am: 6fdc9953f4 -s ours am: 4dd58128c0 -s ours am: 4241296c2c -s ours

am skip reason: Merged-In I03a56f68a7e53d941809560b943153b8fc31decc with SHA-1 cd47b8f445 is already in history

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

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