am 6bb4af27: am e19ed435: Merge "Add explicit refererences and logging to...
am 6bb4af27: am e19ed435: Merge "Add explicit refererences and logging to KeyguardSim/Puk" into klp-dev
* commit '6bb4af27':
Add explicit refererences and logging to KeyguardSim/Puk