Merge "Update DPM strings for keyguard features" into mnc-dev

    <!-- Description of policy access to disable all device cameras [CHAR LIMIT=110]-->

    <string name="policydesc_disableCamera">Prevent use of all device cameras.</string>

    <!-- Title of policy access to disable all device cameras [CHAR LIMIT=30]-->

    <string name="policylab_disableKeyguardFeatures">Disable features of screen lock</string>

    <string name="policylab_disableKeyguardFeatures">Disable some screen lock features</string>

    <!-- Description of policy access to disable all device cameras [CHAR LIMIT=110]-->

    <string name="policydesc_disableKeyguardFeatures">Prevent use of some features of screen lock.</string>

    <string name="policydesc_disableKeyguardFeatures">Prevent use of some screen lock features.</string>

    <!-- The order of these is important, don't reorder without changing Contacts.java --> <skip />

    <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->