Minor location fixes

-Remove some unnecessary code
-Normalize logging messages
-Fix minor bugs cleaning up alarms
-Fix handing getCurrentLocation registrations after binder failure

Test: presubmits
Change-Id: I9bac53a5c2a6565866350feb5bb51fedc61f13b9