Merge "Fix 5326463: rework sim state handling in lockscreen" into ics-factoryrom