Don't consider input restricted when the lockscreen is disabled by an
app.

Fixes the secure lockscreen occasionally appearing when disabling the
lockscreen via tile.

Change-Id: I078584d0235c1cc958f89ce12ddf3cc1117a5687
When DPM is updated while lock screen is inhibited, don't
unconditionally enable lock screen.

Change-Id: Iab2af06eb8e41fbcfc6adfbeb5b42a9bbf446fe9