[automerger skipped] Merge Android U (ab/10368041) am: fc8695529a -s ours am: 15287156ff -s ours am: 5ce94fe724 -s ours

am skip reason: Merged-In I13480bb2489b45a0eea0310acac16de05ece2df1 with SHA-1 7699eed4d7 is already in history

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

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