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

Change-Id: Ib3230340918d5d22a44149cacb006b0ad59dcc56