Merge "Supress SIM_STATE_UNKNOWN when not PERSOSUBSTATE_SIM_NETWORK"