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

Profile currently allows the user to override the keyguard set by
device policy, which is undesired.

Change-Id: Id8d80cfdad51ca0a64dc231a77e53b104ecb9825
frameworks/base: phonenumber location support

Change-Id: I71d897ec4dc7f6a2c755b9f9f088686ddd082429
frameworks/base: lunar support

Change-Id: Ib41798a62b11ca28728f4e42b76c100619191cca
frameworks/base: Exact time display for Chinese

Change-Id: Ic7f8340ddccfbcab63a9d4531b9fed2e0b2e7195
frameworks/base: code cleanup

Change-Id: If505a98b0e120d552f7337bd3e3c23e84a8b67a5

clean again

Change-Id: I89676195f938e399e3b09599069cf680e030033a
frameworks/base: fix lost setting

Change-Id: I3ba42dcdced18f139e8a0a1008c2dcc3efed9a4d
Merge branch 'cm-11.0' into martincz