Merge changes from topic "biometric-unlocked-required"

* changes:
  Tell keystore which SIDs can unlock this user
  Use UserHandle.myUserId() to look up user