Merge "build: add hwservicemanager to the core packages" am: 69bd0bf22a am: 3f044f007f
am: a65c0d3481

Change-Id: If5968ce47c39b5fd55f30893550d581d4c04e414