Merge "Reset mCurrentUserId when fingerprintd died"
am: b60951f670

Change-Id: I807b8c1b2d053d726c7e16dd8b8f5c2f62bdf8ad