Merge "Revert "Added android.software.device_admin feature."" into sc-dev