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

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