NetworkController: Fix hiding signal strength icon when no SIM icon shown

* This now handles the case where the no SIM icon is overlaid with the
* signal strength icon when WiFi is disabled or not connected.

Change-Id: Ie5bf3d9f5cb4752ff631c8fcf7b1a5628219b31b
Make lock screen menu button actions work regardless of rebinding

Fixes 'Menu unlock' and (Lock screen->Button actions->)'Long press Menu button'
when the menu button is assigned to an action other than its default.

Change-Id: I4c2e2cf47fa2f0c171e3599cdc36bc744a708c3b
Merge "Make lock screen menu button actions work regardless of rebinding" into cm-10.2
Merge "NetworkController: Fix hiding signal strength icon when no SIM icon shown" into cm-10.2
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2