Merge "Revert "dumpsys: add option to list hardware services."" am: 9555a5d497 am: d2390bea79 am: 8d3069503e
am: 36ec1bc76f

Change-Id: I5b16be2dae542e0becc114f36a2f75418e9911d5