am f4292478: Merge "Fix keyguard/Keystore storage issue" into klp-dev

* commit 'f429247867ac524cf63bc01499ac47a90ebcaca9':
  Fix keyguard/Keystore storage issue