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

Change-Id: I047aeb10e151a1ed9505f2a1dd093e846ff656d8