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

* commit 'e19ed43551bc1603a41f376883f69eeee12182f3':
  Add explicit refererences and logging to KeyguardSim/Puk