Profile: respect DPM when overriding screen lock (2/2)

Change-Id: Ia0c2b51cfa35e47328a68366964f231e2bb7ebfa
Merge "Profile: respect DPM when overriding screen lock (2/2)" into cm-10.1