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

Change-Id: I5dc594a3219cb2c99e12818553f414f9a87184fd