Merge "Handle multi-sim PUK reset in emergency dialer" am: 10ec0c6d99
am: 19de8e04cf

Change-Id: I9a29e8f419c3678463df4839f4f7365304485706