HCI: Fix improper rfkill handling am: 2e3a1ad611 am: e63b034201

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3408839

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