am 304e3772: Merge "Fix wrong mode for fingerprint unlock when bouncer not showing" into mnc-dr-dev

* commit '304e3772273cd39ae55fbdc1c453d8fa50258670':
  Fix wrong mode for fingerprint unlock when bouncer not showing