Merge "Move bootctl CLI tool to new BootControlClient" am: 86bbe64936 am: ef4b6466ea am: 643fe5dd1e am: ecb93b84d0 am: 30af3dc464

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2153097

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