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

Change-Id: Ib70ddc0635bc3a502dbc9f7eb31c5716860e9833