[automerger skipped] Merge "Merge tm-qpr-dev-plus-aosp-without-vendor@9467136" into stage-aosp-master am: 0a14873b3d -s ours am: b01c76e334 -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: I691695dcac203c8ea202e38fe545015a77550ecb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>