Merge pull request #21515 from weigao123/Bug980217-master

Bug 980217 - [master] Make "Skip" and "OK" buttons show when entering SIM 2 PIN code. r=Alive
Conflicts:
	apps/system/js/system_dialog.js