Merge "Fix LocationManager.getProvider() API breakage."