Merge "db845c/rb5: Make version 4 as the default boot image header" into main am: cf0c9fe4e3

Original change: https://android-review.googlesource.com/c/device/linaro/dragonboard/+/2647984

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