Merge "Make new SIM state related broadcasts protected." am: f06d35bb8e
am: 19ff9539f5

Change-Id: I7ce63074db1a44ade6ae41d55c1da8f9c8b479a8