[automerger skipped] Merge Android U (ab/10368041) am: fc8695529a -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: I59674251130b35c217b639157fd9607fe5c790e1 Signed-off-by: Automerger Merge Worker <[email protected]>