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

* commit '2272602032e5051d5067a7a95c741304468a81af':
  Fix 5497305: Make sure we show SIM unlock when "None" is selected