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

Change-Id: I022d2e803e169907c32fc7e263090ec2896d94c5