Merge "Hide status bar icons if showing bouncer on keyguard activity" into pi-dev
am: 5cfe787dec

Change-Id: I909b5989fa79f11e20bb7760bed003077344870e