Merge "Revert "Adding SecureTouchListener to DeviceAdminAdd"" into oc-dev