Merge "Fix DevicePolicyManager crash when settings password quality (and possibly others)." into jb-mr1-dev