Merge "Add explicit refererences and logging to KeyguardSim/Puk" into klp-dev