[automerger skipped] Merge "Do not consider SIM state for inactive SIM/modem slot." am: 445720a321 am: a575fdfc31
am: eb7ac68dff -s ours
am skip reason: change_id Ieff64f7c2e7bf4db7d603d3824dc6fea71e3f6cd with SHA1 b908f9c5f9 is in history

Change-Id: I1a9df917aa7cb9afbac4c2b399a4c7e4f25037c8