Merge "Update re hwservicemanager debugDump semantics."
am: ed2debbb47

Change-Id: Ibcac4fabedc0f3a1b310d02510785e4c46261a3b