Merge "DevicePolicyManager per user" into jb-mr1-dev