Merge "Move getRawServiceInternal to ServiceManagement."
am: 63391f5c02

Change-Id: I988408ae41a558b9c9ad0e923640b0e731d2d790