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

Change-Id: Iccb9ccc8b0a4c47eba142c9cb3bb96566689c840