Merge "Device Admin Settings changes for Device Owner" into jb-mr2-dev