otablock: Disable only the actual activity, leave the service on

This is apparently shutting down uncleanly and frequently leaving
unwanted stuff active :(

Change-Id: I08e7b28adf1ec0725b82357df96beda2527e2f16
Revert "otablock: Disable only the actual activity, leave the service on"

This reverts commit 583a6429e6894a5e6dc0a73c48d4513322fe49a4, pawit
got a better fix
otablock: also disable BroadcastReceiver

otherwise it'll prevent the device from going to sleep

Change-Id: I56e20c4b3e33c78f30e095f38240d6663c9d74f5
Merge remote-tracking branch 'cm/cm-10.1' into cm-10.1