Merge "HalDeviceManager: Lock the service manager callback" into oc-dr1-dev
am: 4263123815

Change-Id: I1f5531e2cb09a263c0b3ea75d9d4ee6541ac2f00
tree: b2de6626cae500a32f69880286ac62fe98d99f85
  1. service/
  2. PREUPLOAD.cfg