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

Change-Id: Icd688e7e59c95ae91787c9f35e5c3d814062b1ce