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

Change-Id: I01551d9d8e14e7a9bd4ef5178b571beee032735b