Merge "Revert "dumpsys: add option to list hardware services.""