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

Change-Id: I56bb5b63464eadce740708f03b8ca0b49f9be133