Merge "hwservicemanager: restart hals when restarted" am: c3b9dd7d19
am: e5494114f9

Change-Id: I4e6f5d4f47fd37377316705dfdccfa9ba947ef80