Merge "Convert vold to new BootControl client" am: 6083e0196b am: de2d1b6cc7

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2132797

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