Merge "[automerger skipped] Merge "[RESTRICT AUTOMERGE] Use different criteria to check SIM state for different purposes" into pie-cts-dev am: 0be5880d3e -s ours am: 7ae8718806 -s ours
am: 1e015adba2 -s ours
am skip reason: subject contains skip directive

Change-Id: Iad778a0c0923146e675ea8b19e8b6398e094c0d3