am 7c95ae91: am 67fc6b0b: Merge "Fix issue where keyguard reports a valid token but doesn\'t draw" into klp-dev

* commit '7c95ae91b69a1aaae8e0ec41d0e76c66ee52f31a':
  Fix issue where keyguard reports a valid token but doesn't draw