HCI: Fix improper rfkill handling am: 2e3a1ad611

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

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