Merge "Ensure that hwservice_manager adds / finds make sense." am: f21085ca29
am: 4aa9123f1b

Change-Id: I3db61fe0cb2a78d2607bc24081870da67fef0abb