am 82c09d6f: am 7dbbaf7e: Merge "Fix jank while unlocking and security is set" into lmp-dev

* commit '82c09d6f4c133c16bc2b74c485c3063d64b2b973':
  Fix jank while unlocking and security is set