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

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