Merge "Make DPM API for disabling keyguard widgets more generic" into jb-mr1-dev