am 5fb269e4: am 59a1e117: Merge changes from topic \'roosa-lpu\' into mnc-dev

* commit '5fb269e4582d97a541eccf39c2484d8d2a8e16ab':
  Remove LockPatternUtils.getCurrentUser()
  Require explicit userId in LockPatternUtils