Merge "Check for null provider in LocationManager.getProviders()"