Merge "Move LocationListenerActivity to managedprovisioning/"