Merge "Fix available/remaining PIN/PUK attempts."
am: e3ab43eefe

Change-Id: Ia10a529b8d9817fe00d8688c78e3499327c9a8c6