Merge pull request #16014 from EragonJ/bug-962927

Bug 962927 - [DSDS] After PUK is locked, SIM manager did not show "No SI...
Merge pull request #18094 from EragonJ/v1.4-bug-962927

Merge pull request #16014 from EragonJ/bug-962927