When DPM is updated while lock screen is inhibited, don't
unconditionally enable lock screen.

Change-Id: Iab2af06eb8e41fbcfc6adfbeb5b42a9bbf446fe9
Merge "When DPM is updated while lock screen is inhibited, don't unconditionally enable lock screen." into cm-10.1