Most were fixed by including the correct subscription id in the broadcast. The last was testing based on SIM card state which is not something the MobileSignalControllers track anymore so I just pulled it out completely. Change-Id: Ie52068a3c8f8652f1b0641e6376696aeddda26a2