[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: 0dc1efa4ca -s ours am: 6a60424b6b -s ours am skip reason: Merged-In I03a56f68a7e53d941809560b943153b8fc31decc with SHA-1 cd47b8f445 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/libufdt/+/20956737 Change-Id: I2c4d965fe7cc05e7cb1027488945f9ce5cdad745 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>