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

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