Merge "Do not consider SIM state for inactive SIM/modem slot."
am: 445720a321

Change-Id: I757ddca30fac47b084ed03c48642b558a7f9300e