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

Change-Id: I6f4d5148e41181a4498fe1bcc3b2e9e0551785fb