Revert "Fix for crash in LocationManagerService"

This reverts commit 4f16bed84604c9d83449fed97b74a92d3e1b7255.

Change-Id: Id09140550837dc96af0a8727c55d9d11db3762be