Revert "Merge pull request #9294 from fcampo/RemainingPinIntents-settings"
This reverts commit 8c27d942e4cec036e05390b07d8f37049df5cadb.

Revert "Bug 860660 - [settings][dialer][system] PIN/PUK retry counter now displayed correctly.  r=fcampo"
This reverts commit 4eadbbe13043807cdb02a049076949e78d87f90d.
Merge pull request #9352 from fcampo/RemainingPinIntents-ussd

[dialer] Bug 860660 - PIN&PUK: Show counter of trials remain(cherry picked from commit 887cae7e556fc19722011f0674fdd4d4bfeacc3e)
Merge pull request #9340 from fcampo/RemainingPinIntents-system

[system] Bug 860660 - PIN&PUK: Show counter of trials remain(cherry picked from commit b565d874e9dba9d182c9952500869956365dbba4)
Merge pull request #9246 from fcampo/RemainingPinIntents-ftu

[ftu] Bug 860660 - PIN&PUK: Show counter of trials remain(cherry picked from commit 7faefd0273f4dce24563cda57450bfb1c7416b45)
Merge pull request #9294 from fcampo/RemainingPinIntents-settings

[settings] Bug 860660 - PIN&PUK: Show counter of trials remain(cherry picked from commit 4cd2d491c28e7312a2c070ea4bbaf76442161794)

Conflicts:
	apps/settings/index.html
	apps/settings/locales/settings.en-US.properties
Bug 860660 - [settings][dialer][system] PIN/PUK retry counter now displayed correctly.  r=fcampo