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

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

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