Merge "Dismiss SIM lock page after correct SIM" am: eb1d6d91af
am: 737945fbd5

Change-Id: I38e3374723e4e756688eb3572cffc59834924625