Merge "Move LocationManagerService to server.location package"