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

Change-Id: I4d7af1e21242752e8c0c9a9822d31e2efdbecd81