am 4eada647: Merge "Only show the bouncer for the assistant if secure." into jb-mr1-lockscreen-dev

* commit '4eada64770bc2f021cb04cbb77efbad1c9a7adc4':
  Only show the bouncer for the assistant if secure.