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

Change-Id: I67ddb422ef54ef0462f6a6342c515bce740b3872