Merge "hwservicemanager: halserverdomain"
am: 6456542f3e

Change-Id: I353c8d695a5c995f72fe865f27682a05011f8f55