Merge "dumpsys: add option to list hardware services." am: 4d741ebedc
am: 57d82aa9fd

Change-Id: Ife39a9b63ccf7a8fd83ad9b142c68cb0b0f321e4