Merge "Revert "wificond_service: drop system_service typeattribute""