Merge "Update DevicePolicyManager documentation with new keyguard flags" into jb-mr1-lockscreen-dev