Merge "Reset mCurrentUserId when fingerprintd died" am: b60951f670
am: 674922574a

Change-Id: I7355b6da155aab3996fdd773eafc489362744846