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

Change-Id: I5901039247203152a9e0911bd8d1ef8a68bc4ea9