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

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

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