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