Merge "hikey960: Switch to bootcontrol 1.2" am: 498610c467

Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/2133814

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