am bf17375e: Merge "Should reset mDismissKeyguard on keyguard secure change"

* commit 'bf17375e5e6195122ee24295cf05f012822711ec':
  Should reset mDismissKeyguard on keyguard secure change