Merge "hikey960: enable the bootcontrol hal for hikey960 build" am: a6b96db0e7 am: 6709139ada am: 6120684c67 am: 42842e0940 am: 21f95c1c9b

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

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