Merge "Add Executor APIs to LocationManager"