Revert "Revert "rfkill: Don't run btlock""

This reverts commit 6e4088f7a12f160e87bfb6505c4408e48f2d7485.
Merge branch 'cm-11.0' into kk_mkt