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

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

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