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

Change-Id: If537428f1b417c155a19be8abb07f9d6926b10a7