Merge "Ensure all active Device Admins are listed." into jb-mr2-dev