Merge "Fix 5497305: Make sure we show SIM unlock when "None" is selected" into ics-mr0